Merge "add better support for landscape mode + minor cleanups"