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

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