Merge "Allow bluetooth OPP transfers to be stopped." into jb-dev