Tidy up onConfigurationChange internal handling