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

Change-Id: I1418be1b6a7b669c5a7b999b61dba4e357ca7646