Merge "Avoid full unparcelling where possible in Bundle"