Merge "Updated onSharedPreferenceChanged listener behavior."