Hide the entry point only if it's known to be shown

Bug: T85056
Change-Id: I5b54d4d5eeaf729b7510e4c86d9871ffc6534a94
Merge "Hide the entry point only if it's known to be shown"