Merge "Map visibilty based on appId and uid"