Merge "Adjust margins for kids mode back button."