Merge "Fixing bugs due to the new custom accessibility action APIs."