Merge "PIP: Fix system UI crash" into nyc-dev