Merge "Pal: revert changes to avoid potential priority inversion issue"