Merge "AOSP change for showing the app icon."