Merge "Lock down window manager while changing opacity" into lmp-dev