am 10dde211: merge from open-source master

Merge commit '10dde211457417aa1392cc3a5457728c84ed0d2f'

* commit '10dde211457417aa1392cc3a5457728c84ed0d2f':
  Remove top panel in alert dialog if empty.