Merge "Show the app shelf depending on the platform feature"