Merge "Remove tempwhitelist avoid idle command was block" into pie-cts-dev