Merge "Fix brightness transition from temporary to automatic brightness" into udc-dev