Merge "[ENR] Ensure ENR views visibilities" into main