Merge "Return null from compat when resolveActivity returns null." into ub-now-nova