Fixing activity leak on config change
am: 7fcbd2379b

Change-Id: I33a78825552b3a050ee95b42fa0699d9b063c281