Merge "Allow a drawn reported activity to keep screen brightness"