Merge "Add timeout for displaying 5G icon" into qt-qpr1-dev am: 8a66dd0357
am: 3ddda4234a

Change-Id: Ifd6dfc02986450ee33c853f9df44970a0f74cea1