am 5c7792dd: am 254ee387: am aef3698f: Merge "resolved conflicts for merge of 91d2cbf4 to mnc-dev" into mnc-dev

* commit '5c7792dd903bee89a59d67c4da975b9fe7f37a8a':
  Turn off theater mode upon power button press.