Merge "Keep screen on when user undims it manually" into sc-qpr1-dev