Merge "Add dock charging state into stay awake feature (2/2)" into tm-qpr-dev