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

* commit '9161871f8374a3d3ec184dd1c716d117e06381c6':
  DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...