Merge "OPP: Fix leaked IntentReceiver issue" into q-keystone-qcom-dev