Merge "Fixed bug: Not everyone has home controls yet, or pets." into rvc-dev