Merge "Revert "Hide system apps until installed (1/2)"" into pi-dev