Merge "Add ability to enable extra udfps vibrations" into sc-dev