Merge "Fix bug #15687210 Settings crashing when turning ON<>OFF developer option."