Merge "Reduce notification section gap on lockscreen; increase gap when going to shade" into tm-dev