Merge "Fix focus issue after calling ClearFocus api" into devel/master