Merge "Handle private API usage from System UI" into main