Merge "Modify auto brightness to return to dim level." into jb-dev