Merge "Reduced complexity of dali-table-view" into devel/master