Merge "Fix pending intent class loader" into main