Remove workaround since compose navigation issue was fixed.

Test: Manual

Change-Id: I6931a4fd5f8626e58c7779d71592a1a0bf733ce3
3 files changed