Merge "Clean up IllegalStateException for page pairing" into sc-v2-dev