Merge "Fixed bug with activity behind non-fullscreen activity not displaying"