Merge "Fixed a bug where the shelf could be stuck translating" into pi-dev
am: aa7766b4d4

Change-Id: I8405874f50491b724543973d7a5947caa3e64e7a