Merge "Fix issue where keyboard would not be dismissed" into rvc-dev