Merge "Re-add support for the app shelf"