Merge "Fix too agresstive test, ActivityInfo should never be null." into main