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

* commit '5cd293b37946ccc60c148e4a17e5f59620999046':
  Only enable theater mode by button press after setup.