Merge "Fixing Launcher3Quickstep build, broken due to SDK changes" into ub-launcher3-edmonton