am 8c5b15c6: Merge "Fix a bug in action menu measurement" into klp-dev

* commit '8c5b15c628b89c4fb832b7311e5d13ccea4aff04':
  Fix a bug in action menu measurement