Merge "Hide system / root UID apps from toggle permission page" into main