Merge "Add default brightness config to dumpsys display" into qt-dev