Merge "Use activity for brightness dialog" into lmp-dev