Merge "Refine adjustIsVisibleToUser"