Integrated fingerprintgroupview into entityview

Change-Id: I38cc93a9dbfae2ca9b2b04d2e12de58a0850acf0
Merge "Integrated fingerprintgroupview into entityview"