Merge "Fix Accessibility button & gesture settings did not update correctly in Tablet device" into sc-v2-dev