Merge "Fixing issue where overview->normal workspace mode cannot be done by tapping b/31458165" into ub-launcher3-calgary-polish
am: 80e6aa4b01

Change-Id: I07d8700dd8683100c59c8ecd5efedbb6465056c5