Merge changes I1375c198,I49bc9bb6

* changes:
  Clean-up some out-dated layout shenanigans
  Fix Restore transition