am 83f2feb5: am 86f289be: Merge "Lock down window manager while changing opacity" into lmp-dev

* commit '83f2feb5fc92fd6364f036fd4430dd7331a85d89':
  Lock down window manager while changing opacity