Merge "Avoid loading app icon bitmap when possible"