am 5a7a1ce0: Merge "Fixing workspace state issue with option menu." into ub-launcher3-burnaby-polish

* commit '5a7a1ce0a7affdff02029793ac24b2581075acee':
  Fixing workspace state issue with option menu.