am c2a2c623: Merge "Don\'t clear flags in startActivity" into ub-now-nova

* commit 'c2a2c6238d7bc337f047880166181794b2b9e520':
  Don't clear flags in startActivity