Merge "Include exception as cause of BadParcelableException"