Merge "Avoid NullPointerException when updating preference intents"