Navbar : Rework logic for determining orientation

This patch introduces better checks for hybrid ui's.
This should fix issues of small buttons due to incorrect ui determination

Thanks Rolf Arne Schulze for testing :)

Patchset 2 : Add more constraints for hybrid detection
Patchset 3 : Fix mismatched constraints

Change-Id: If5b61dc4764a98deedb5b801d11451fed2488cba