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

Change-Id: Ic39ca931edf9c0da6925e9572b4660e08ca5f180