Equal margins for plugin icons. see #28785.

Built from https://develop.svn.wordpress.org/trunk@29587


git-svn-id: http://core.svn.wordpress.org/trunk@29361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Screen: Move editor scrolling screen option to the proper place.

see [29336], see #28328.

Built from https://develop.svn.wordpress.org/trunk@29588


git-svn-id: http://core.svn.wordpress.org/trunk@29362 1a063a9b-81f0-0310-95a4-ce76da25c4cd