Merge "Shelf alignment and animation fixes" into pi-dev am: 258c743697
am: 24e7aa812f

Change-Id: I07aba8e3ca83ac6411c12700d9170f11ee9bf26b