Merge "Use the WS hidden flag instead of WSA for dim check"