Merge commit '655ec0dc07e1978879336ac7adbf638a7f8fc85e' * commit '655ec0dc07e1978879336ac7adbf638a7f8fc85e': Add ability to keep screen on while docked.