Merge "Don't apply rounded-corner animation on non-default display" into qt-dev
am: 97af1b385e

Change-Id: Ia59cff5885fda044bc945713a19645193b8d906d