Merge "Fix broken FrameLifecycle due to Blast adapter" into sc-dev