Merge "Fix NPE in requestPowerState when displayPowerController is null" into main