am 944e41fe: am 10dc5d97: Merge "proper geometry for heads up on tablets."

* commit '944e41fe32ea863b61cab0f8002a86f6e5a0412b':