Merge "Fix janky in App info screen"