Import selected changes from ApexQ jellybean kernel release

Probably some more I missed