Add more 4.4 specific layout fixes and fix non 4.4 devices.