Merge "Remove brightness dialog timeout" into lmp-dev