Merge changes from topic "lock_icon_move" into sc-v2-dev

* changes:
  Moving notifications and keyguard status higher in split shade lockscreen
  Moving now playing widget above lock icon in split shade