Merge "Add thread safety annotations to inputflinger"