Merge "Fix NPE from freeing expanded view while expanding." into rvc-dev