Merge "Input: Handle parent surface crops 2/2"