unify settings popup handling for video mode

Change-Id: I41353e781b943d8d1f98f13cdf6cdd8e90a99194
speed up zoom

Change-Id: If89046147dcdd4df872785047585dbb79ee20e63