Merge "Added Settings intents" into rvc-dev