Merge "Guest option should not be shown for the guest user" into mnc-dev