Merge "Delay setting hidden until after isVisibleNow test." into jb-mr1-dev