Removed onResume() conditional else.
Merge remote-tracking branch 'origin/master'