Merge "Cleanup action key label unit tests"