Merge "Make brightness transition to ON immediate if the screen was OFF because of close proxiity" into tm-qpr-dev