Merge "Handling IllegalStateException which can be thrown by the system when the user is locked" into ub-launcher3-calgary
am: a42b283028

Change-Id: I4ecf1e8540e23210117ad71977535e45aa9d3558