Merge "Fix notification being slided over with the gear not showing" into nyc-mr1-dev