Merge changes I9025a0a3,I48a1d380 into udc-qpr-dev

* changes:
  Add the COMPOSE_QS_FOOTER_ACTIONS flag
  Add the COMPOSE_PEOPLE_SPACE flag