Merge "Fix for "Can not perform this action after onSaveInstanceState""