Merge "Remove softkeymaster"