Merge "PIP: Fix runtime crash in System UI" into nyc-dev