Merge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bac am: 08978cd0 am: 88ab92ce am: c49702e4 Change-Id: I7d3c453536a272c969745ad2df4c9bf319efc19b