Merge "Check return codes in softkeymaster."