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

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