Merge "Test when WM needs to be reshown..." into main