Complete and Fix Expanded Desktop Option

Change-Id: Ifb85e52e110c90c88370f18172328ad24fcae750