fix active display when not in pocket mode

some other fixes as well

Change-Id: I0c01f7b7ac2113fd3a3f06ff1663c133acba662d