Merge "Allow custom toasts only if app has resumed activity" into rvc-dev am: 9bcbce4a20

Change-Id: I52727da21108c07aeb482fd5adcd22009f40edad