Merge "Use keymaster 1.0 softkeymaster"