Merge changes from topic "presubmit-am-4f9fc19ffc9c438783716840b90748da"
* changes:
[automerge] Fix an issue with default background 2p: acbd2ebe 2p: fa0ca00f
[automerge] Fix an issue with default background 2p: acbd2ebe
Fix an issue with default background