[automerger skipped] Merge "Use the main thread to update alignment indication" into qt-qpr1-dev am: 94431615b1 am: a939bb2f64 -s ours
am skip reason: Change-Id I89bf1c188d6ba094106e059f1590c9eaf3703bb8 with SHA-1 0e72713fdf is in history

Change-Id: I2d2873c4db0a23b5b80a1cc51f2287a052dc7c21