Merge "Don't treat user switch as a brightness slider interaction" into tm-qpr-dev