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