Merge "Removing unused layout bindings" into devel/master