Merge "Move shortcut falsing shake and vibration to onclicklistener" into udc-qpr-dev