Merge "Fixed signals for toggle button" into devel/master