Merge "Use the main thread to update alignment indication"