Merge \"Adding a view to indicate space blocked by QSB when QSB is hidden\" into ub-launcher3-calgary
am: ff9155674d

Change-Id: I765839c0b671d2866006d236299fe92215c86bbc