Merge "Taking local screenshot before navigation state is restored" into ub-launcher3-qt-dev
am: e7f313dc0c

Change-Id: I210029248261971df07524e7836a54bd721daa4e