Merge pull request #8669 from marcofreda527/bug-848597-proximity-v2

Bug 848597 - The timing of enabling Proximity sensor doesn't consider alerting state. r=timdream, a=tef+
Bug 856991 - Use equals to look up phone numbers in SMS app instead of contains, backport from master r=julienw