Merge "Maintain the position of accessibility floating menu" into sc-dev