Include base module in mobile view

Change-Id: If437fbb162303ca3ca90f815a5b0c323a238e36e
Merge "Include base module in mobile view" into pagePagesRefactoring