Merge "Revert "For 1 sim devices, hide signal empty state"" into qt-r1-dev