Merge "Unrestrict granted ECM setting for A11Y" into main