Merge "Adding a portrait and landscape file" into klp-modular-dev