Merge "Remove smart actions accessibility TODO - this works fine already."