Merge "Developer option to force RTL layout" into klp-dev