Merge "Enable WM remote occlude flag; fix occlude state issues." into tm-dev