Merge "Shelf alignment and animation fixes" into pi-dev