Move locale update to after app has been enabled