Merge "Fix sms app changed broadcast" into qt-dev am: 0a98e4b693
am: cbdc139229

Change-Id: I744b006b75fd6e07d01aa202321d73680096c5d0