Added support for feature requirements and return after dismiss delays. Change-Id: I80e80a55817cd4d9717876e34fc591b3dd3228f1