Merge "For vibration settings page, create controllers from xml" into pi-dev