Merge "Fix text size in Fake Action Bar" into klp-dev