Merge "Prevent archived apps content description from being overridden unexpectedly" into main