Merge "Improve wait for PIP window condition on app helper"