Merge "Check resumed state of activity before skipping resuming" into udc-dev