This reverts commit 0bb93d4b. Reason for revert: Breaks apps using Presentation in combination with private virtual displays Bug: 141745510 Change-Id: I6673946137d6b12fa725e6df1c936068dedc3787