Merge "Flush addPersistentPreferredActivity setting in DPMS"