am: e12aece4ca * commit 'e12aece4cad849efbbe6a806f132613a56699230': Ensure surfaces stay alive until activity stop.
e12aece4ca