Merge "Fix Configuration layout direction comparison." into klp-dev