Merge "Fix clearkey return code for setSecurityLevel" into pi-dev