Merge "Use the main thread to update alignment indication" into qt-qpr1-dev