Merge "Fix issue with settings launch animation" into rvc-dev