am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with...
am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
* commit 'c83a6121':
Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR