Merge "Move Event Handlers to View class" into devel/master