Merge "Handle ParcelableException instead of crashing system server"