Merge "Fix tablet layout and resources." into klp-dev