Merge changes from topic "mpietal_smartspace" into tm-qpr-dev

* changes:
  Remove smartspace flag
  Transitions - Add GONE->LOCKSCREEN support