Merge "Fix warnings about deprecated setStatus(int,String)"