am 2fb7c005: am 8902df1b: Sync PhoneWindow Menu Handling

* commit '2fb7c005e041e648f3592728fbaad2d33d6d3fb2':
  Sync PhoneWindow Menu Handling