am 51a0c90b: Merge "Add new API to take over a window\'s Surface." into kraken