Merge "Fix ActivityManagerManifestLayoutTests#testMinimalSizeDocked."