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

Change-Id: Id769ac82f33295e08840790e4834b66d1e8e8063