Merge "Extend shadow display frame by 2x shadow length instead of 1x" into main