Merge "Don't allow unfocusable activity/stack to gain focus"