Merge "Don't recycle action button views" into klp-dev