Merge "Don't touch auto dim on app change" into oc-mr1-dev