Merge "Implementing app-centric Shelf."