Merge "Merge "Hide system apps until installed (1/2)" into pi-dev am: 56cc567d" into pi-dev-plus-aosp