Merge "Make activities invisible when the display is turned off." into qt-dev
am: 832c8a2cb8

Change-Id: I5c379c2d1866577394ad156e10330f242bdcafb9