Workaround for NPE inFragment.mContainerId

The current workaround is not complete for opening guided step fragment
on existing fragment. Added protection for both container id.

Tested on Emulators of API22 and API23

Bug 24375784

Change-Id: I2ae73ea50bde2bee0e6c8f1a855e4f993ad5068b
3 files changed