Merge "Draw outline inside the view so it would not be cut off" into main