Merge "Use the main thread to update alignment indication" into qt-qpr1-dev am: 94431615b1

Change-Id: Ibd86563b5d894e2d6623e17986cf13814fb0268a