Merge "Signal strength: add more checks to signal strength," into kk4.4-caf