Merge "Fix PIP keyboard test"