Merge "Correct edge to edge issues observed in some screens." into main