Second commit of Full Screen Photo Viewing checkpoint