Merge remote-tracking branch 'remotes/origin/MP1-4302_PowerScheduler_registers_for_PBT_POWERSETTINGCHANGE_event'
Merge remote-tracking branch 'remotes/upstream/master' into 1.6.0Fork-BDJ