Merge "Don't clear flags in startActivity" into ub-now-nova