Merge "Fix NPE if phone ringtone is set to None" into lmp-mr1-dev