Merge "Remove unnecessary border extension when frame size change."