Allow Compositor::Resume to fail and handle it

Android can fail to resume. This merges the code
for handling that with the common code better.