Merge changes I53d2205b,I2dc43001 into sc-dev

* changes:
  Smartspace - Update fonts/margins
  AOD/LS - Move clock to start