Merge "Replace ACTION_ALWAYS_ON_STATE_CHANGED broadcast with a callback"