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

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