Merge "Implement missing visibility management for FrameLayout foreground" into lmp-dev