Merge "Move logic about hide system / root UID apps" into main