am 12b239e6: Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev

* commit '12b239e6d39ad5a35f68e7bcd5f644a793b5cb74':
  Fix SetupWizard black screen issue for EDU devices