Merge "Add support for Control keyboard navigation properties" into devel/master