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

* commit '6bf34c8c21e72daf69f1b8d834edfebf140f9b87':
  Lock down window manager while changing opacity