Merge "Fix NSSL bottom margin with 3-button nav and no split shade" into tm-dev