Merge "Polish popup" into ub-launcher3-dorval-polish
am: df5e2c1a74

Change-Id: Id2c843327c1764edbb2bc22c0b0278ecc6ac4188