Merge "Separate setup_scale_factor/extend_frame_borders"