Merge "When shortcuts close, only set text visible if not in hotseat." into ub-launcher3-calgary-polish
am: 4125386687

Change-Id: I10a7cdd6b8eb49633afa4e07e0e1a184760786e5