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

Change-Id: I18fa71b44e1c45841635f4da7e88b690726a8579