Merge "Fixing wrong cliping height when screenshot is rotated" into ub-launcher3-master