Merge \"Close the shortcuts container in various places.\" into ub-launcher3-calgary
am: c7163ebd03

Change-Id: I2df7ed450b8aefa51cc90434486a82fc590fc899