Merge "Allow updated system apps to retain priority" into gingerbread