Merge "Move zen mode constants and code to framework" into lmp-dev