Merge "Always index RingerModeAffected slices" into tm-qpr-dev