Merge "Fixing launcher UI not reapplied properly when IDP changed as a result of display changes" into ub-launcher3-master