Merge "Do not allow swipe to hub from dream or lockscreen" into main