Merge "Make the binder_lock category optional"