Camera2: fixed more settings popup

-correct popup level handling
-dont show more settings if empty

Change-Id: Ib314a3e895efa2c5e8e81dc634cc805dc5e8650f
merge changes from Omni 4.4 into local branch