(cherry picked from commit fccf6aa0)

And Fixed initial snpshot/fullscreen state.
It fixes a regression introduced by fccf6aa0