Merge "Remove unnecessary wallpaper adjustment on transition" into tm-qpr-dev