Merge changes I4dff7875,If2dbfc35 into tm-qpr-dev

* changes:
  Remove smartspace offset
  Bouncer - Fix activity launch