Merge "Fix unable to resume activity with dismiss-keyguard flag"