Some small padding mini fixes
Reduce checks to only onResume and cleanup to onPause
Merge branch 'in_app_notifications' into v4.1.0-RC