am 3b60f72f: am 9b126882: am 01232c50: am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev

* commit '3b60f72fbaaeb7c52f5e86ff9f8d5dade0d0b444':
  Fix Custom action mode menu item onclick is not working