Merge "Revert "mm-video-v4l2: Amend perflock hint logic""