Merge "Fix issue with views becoming visible with stale content."