Revert "Initialize matcher in onCreate()"

This reverts commit 8012f8c0042a1f399785747b43d9123e84cc0b49

Change-Id: I65a864dfe9128d9867cd3f797bccacfedcc3b1fb
2 files changed