Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method"