Merge "Careful with screenshots containing secure layers!" into qt-dev am: f8f5f0290e
am: cea68c7904

Change-Id: Ia2649df1fe70cc01b1544de9f6f22010c932f220