Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-dev