Add place-holders for new screens
(cherry picked from commit 8f7aa4619aa99d2201be0757a2961093651d2b10)