Merge "Do not show entry point when no CD attached" into main