Merge "Add timeout for displaying 5G icon" into qt-qpr1-dev