am 31b37509: am 5cd293b3: Merge "Merge commit \'91d2cbf4\' into manualmerge" into mnc-dev

* commit '31b375095530c7414305568f3e9ceecfb66ba5bf':
  Only enable theater mode by button press after setup.