Fix switching from 480p video to picture mode

Change-Id: I7468308e9055966b272b6486c2d9c52406b5acf9