feat(master): Add baselayout to manifest

Change-Id: Ie3f0dd6d39ac94c2b2c652ff037d758c940eb238