Merge "When opening from locked shade, wait for the shade to unlock before expanding." into rvc-dev