Merge "Fix layout crash & bubble anything with valid bubble metadata intent"