Merge "Fix a bug in action menu measurement" into klp-dev