Merge "Hide network select in some situations" into qt-dev am: 2bdf358cd1
am: a444fd99be

Change-Id: I33ac534904a87d230b778a2611fea8656cdb0adf