Added check for @AndroidActivity to determine if the annotation is decorating an actual Activity type
AndroidFragment improved
Merge branch 'merge_upstream_fragment_annotation_improved' into develop