Merge "Set the correct flags for brightness dialog to show on all users" into jb-mr1-dev