Merge "Always restore staged sessions on boot." into qt-dev
am: f3c1480ea7

Change-Id: I63a6d57fd40998656ffc8495422aa0ae86a87332