Merge "Improve IsMovableObject logic."