Merge "Revert "Move main thread in IccPBIM to other thread to fix deadlock."" into q-keystone-qcom-dev