eb1d3798e3
Also sneaks in some whitespace cleanup for PhoneWindow! Change-Id: I1bc8a889a59d69ae80b6cfbf54d57cd7f8ad4a36