Merge commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f' into gingerbread-plus-aosp * commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f': Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.