Merge "Rename USER_QUERY -> LIVE_QUERY" into jb-mr1-dev