Merge "Fix ordering issue with vibration" into qt-dev
am: 219bb92aee

Change-Id: Ic73c1cecd2d1171148c06dcbec201004ec1a61d6