a0f1ac87e9
Commit 8111286463b8 was cherry-picked without accounting for the screen/display API difference between 3-30 and 3-28.