Merge "Code cleanup: removed doEnableScreenOffSuspend/doDisableScreenOffSuspend" into main