Merge "Remove STOPSHOP, disable DEBUG_ANR" into qt-dev