Merge "Recreate icon alignment controller when isIconAlignedWithHotseat changes." into main