Hide the 'add subscription' form during loading
Merge remote-tracking branch 'upstream/master'