Merge "Fixing crash in configuration change for secondary users."