Merge "DO NOT MERGE Fix issue #24118803: The screen doesn't turn off..." into mnc-dr-dev