Merge "Fix unnecessary warning log in applyOptionsLocked."