Merge "Save and restore brightness on orientation changes."