Android YDP : Package name changed and alignment of logout button