Merge \"Cancel exit spring loaded runnable when launcher state is set to APPS or WIDGETS b/29645452\" into ub-launcher3-calgary
am: 72dc60c576

Change-Id: Ida309677c84d067f012841aa9edeb21ec03594fe