Merge "Updating programming guide for control property registration" into devel/master