Merge "Default vibration amplitude resolution added" into pi-dev