Merge "Prevent ringing updates" into pi-dev