Merge "Try fix Bundle#getParcelable error for relayout bundle" into main