Merge "Fixed screen decor layout frames am: 0d83376433 am: 22d2c963c3" into qt-r1-dev-plus-aosp
am: 9447a9d930

Change-Id: I4fd8bd57ca8bdfcdbf21b4e025c41ba609041091