Merge "Fix NPE when coming back to settings homepage." into rvc-dev