Merge "Fixed unexpected configuration change causing activity relaunch"