Merge "Replace bubble header with adaptive settings icon"