Merge "Fix sms app changed broadcast" into qt-dev am: 0a98e4b693 am: e5c5ec7316
am: 6e7bb1e7cf

Change-Id: I400f58f126c2baea99a5bef7a48a17ea9eef0ea0