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