am a946094b: am 02222ba8: am 42143d73: am e99951bd: am f0f2ffae: Fix issue where extra page hangs around (issue 11634172)

* commit 'a946094bbfad6d3fdd0e1dfaa8fecd4f677a328b':