Merge "QS: Fixup footer + animations" into nyc-mr1-dev