Merge "Call the scrim unlock callback when transitioning to BUBBLES_EXPANDED." into rvc-dev