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