Merge "Prevent cropHint been overwrite by display size." into rvc-dev am: 418b5e7b8c am: 438d61b92b am: 87921cbbbb am: 22c8b0bd08
Change-Id: Ia075ca051e98cfbd0efb4905d37478ade8b30c01
This commit is contained in: