Merge "Add interstitial layout for larger screen devices" into main